Fix things so that bindings are added to the keymap already created by

terminal initialization.

diff --git a/lisp/term/news.el b/lisp/term/news.el
index 448dfd82850e59c4bcc483eb452fde346b307a10..b98364e08a8c71bf6ea86668b121f5473bea6833 100644 (file)
--- a/lisp/term/news.el
+++ b/lisp/term/news.el
@@ -30,8 +30,10 @@
 
 (if (boundp 'news-fkey-prefix)
     nil
-  (setq news-fkey-prefix (make-keymap))        ; "<ESC>O" commands
-  (define-key function-key-map "\eO" news-fkey-prefix)
+  ;; The terminal initialization should already have set up some keys
+  (setq news-fkey-prefix (lookup-key function-key-map "\eO"))
+  (if (not (keymapp news-fkey-prefix))
+      (error "What?  Your news termcap/terminfo has no keycaps in it."))
 
   ;; Termcap or terminfo will set these
   ;; (define-key news-fkey-prefix "P" [f1])

diff --git a/lisp/term/vt100.el b/lisp/term/vt100.el
index 658ab4820f99d25297f8c78ee9d3f8c2e0fa909b..5c723f433f5b962c7106575d0b2c2f33a4e6afb6 100644 (file)
--- a/lisp/term/vt100.el
+++ b/lisp/term/vt100.el
@@ -51,29 +51,33 @@
 ;; SS3 sequences - those that start with "\eO".
 (if (boundp 'vt100-SS3-prefix)
     nil
-  (define-prefix-command 'vt100-SS3-prefix)
-  (define-key function-key-map "\eO" 'vt100-SS3-prefix)
+  ;; The terminal initialization should already have set up some keys
+  (setq vt100-SS3-prefix (lookup-key function-key-map "\eO"))
+  (if (not (keymapp vt100-SS3-prefix))
+      (error "What?  Your VT100 termcap/terminfo has no keycaps in it."))
 
   ;; These will typically be set up automatically by termcap or terminfo
   ;;   (define-key vt100-SS3-prefix "A" [up]) ; up-arrow
   ;;   (define-key vt100-SS3-prefix "B" [down]) ; down-arrow
   ;;   (define-key vt100-SS3-prefix "C" [right]) ; right-arrow
   ;;   (define-key vt100-SS3-prefix "D" [left]) ; left-arrow
-  ;;   (define-key vt100-SS3-prefix "M" [kp-enter]) ; Enter
   ;;   (define-key vt100-SS3-prefix "P" [kp-f1]) ; PF1  
   ;;   (define-key vt100-SS3-prefix "Q" [kp-f2]) ; PF2  
   ;;   (define-key vt100-SS3-prefix "R" [kp-f3]) ; PF3  
   ;;   (define-key vt100-SS3-prefix "S" [kp-f4]) ; PF4  
-  ;;   (define-key vt100-SS3-prefix "p" [kp-0]) ; 0
-  ;;   (define-key vt100-SS3-prefix "q" [kp-1]) ; 1
-  ;;   (define-key vt100-SS3-prefix "r" [kp-2]) ; 2
-  ;;   (define-key vt100-SS3-prefix "s" [kp-3]) ; 3
-  ;;   (define-key vt100-SS3-prefix "t" [kp-4]) ; 4
-  ;;   (define-key vt100-SS3-prefix "u" [kp-5]) ; 5
-  ;;   (define-key vt100-SS3-prefix "v" [kp-6]) ; 6
-  ;;   (define-key vt100-SS3-prefix "w" [kp-7]) ; 7
-  ;;   (define-key vt100-SS3-prefix "x" [kp-8]) ; 8
-  ;;   (define-key vt100-SS3-prefix "y" [kp-9]) ; 9
+
+  ;; Terminfo might set these
+  (define-key vt100-SS3-prefix "M" [kp-enter]) ; Enter
+  (define-key vt100-SS3-prefix "p" [kp-0]) ; 0
+  (define-key vt100-SS3-prefix "q" [kp-1]) ; 1
+  (define-key vt100-SS3-prefix "r" [kp-2]) ; 2
+  (define-key vt100-SS3-prefix "s" [kp-3]) ; 3
+  (define-key vt100-SS3-prefix "t" [kp-4]) ; 4
+  (define-key vt100-SS3-prefix "u" [kp-5]) ; 5
+  (define-key vt100-SS3-prefix "v" [kp-6]) ; 6
+  (define-key vt100-SS3-prefix "w" [kp-7]) ; 7
+  (define-key vt100-SS3-prefix "x" [kp-8]) ; 8
+  (define-key vt100-SS3-prefix "y" [kp-9]) ; 9
 
   ;; Neither termcap nor terminfo will set these
   (define-key vt100-SS3-prefix "l" [kp-separator]) ; ,